Merge pull request #7789 from nextcloud/bugfix/show-resolve-conflicts-dialog
authorMatthieu Gallien <matthieu.gallien@nextcloud.com>
Fri, 24 Jan 2025 14:06:40 +0000 (15:06 +0100)
committerGitHub <noreply@github.com>
Fri, 24 Jan 2025 14:06:40 +0000 (15:06 +0100)
commitaf2027d040c29ac5ddd6ebd260379c3a5d840b89
treeee58b07c87943e1a02e42712c31c41eb95a8efa4
parent0fb6dd4505358222dc13c0bd652b634e9d044faa
parente921e969a5da688276f68a6b237cc42abe667441
Merge pull request #7789 from nextcloud/bugfix/show-resolve-conflicts-dialog

fix "Resolve conflicts" dialog not showing up